Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ocean versions of lake specials #70339

Closed
wants to merge 17 commits into from
Closed

Ocean versions of lake specials #70339

wants to merge 17 commits into from

Conversation

Procyonae
Copy link
Contributor

@Procyonae Procyonae commented Dec 21, 2023 •
edited
Loading

Summary

Content "Existing lake specials now spawn in the ocean"

Purpose of change

Oceans are empty of locations

Describe the solution

  • Lake specials now also spawn in ocean
  • Doesn't remove any specials designed for the ocean from lakes (ie Aircraft Carrier) as getting to the ocean is tedious rn
  • In the future some of these will want either more customised variants to better match the coastal feel or removing entirely once more ocean specials have been made and there's less need to fill the gap
  • Includes some minor changes/fixes/organisation to lake specials

Describe alternatives you've considered

  • Making an ocean vehicle group to replace the lake one where appropriate using conditional predecessor nests but I think I'd rather that be a separate PR with new vehicles to complement some of the existing ones
  • Ideally there'd be some way to make sure a few of these like the lighthouse spawn within a range of natural ocean_shore

Testing

Additional context

Thanks to ralreegorganon for fixing predecessor stuff with lakes so I can test properly

This does mean alot of things with lake in their JSON name now also relate to ocean, not sure where our "no renaming bc wastes reviewers time" stance is on this. Also the "water" special_location is very misleading bc it's only river not lakes nor ocean. Also "river_cave" doesn't even spawn in river.

[WIP Ignore for now] List of lake specials and their new status:

Boat Rental/Boat Rental 1/Boat Rental 2

  • Still spawns on lake
  • Ocean and lake merged specials under the same ids

Lakeside Cabin/Lakeside Cabin 1/Lakeside Cabin 3/Lakeside Cabin 4/Lakeside Cabin 5

  • Still spawns on lake
  • Ocean and lake merged specials under the same ids

Alcatraz Prison/Island prison

  • Still spawns on lake
  • Ocean and lake merged specials under the same ids

lake_shore_dock_small

  • Still spawns on lake
  • Ocean and lake merged specials under the same ids

Island/Island Forest/Sandy Island/Island_1/Island_2/Island_3/Island_4/Island_5_swamp/Island_5_forest/Island_5_forest_thick/Island_5_field

  • Still spawns on lake
  • Ocean and lake merged specials under the same ids

Lighthouse Island

  • Still spawns on lake
  • Ocean and lake merged special under the same id

Lake Island Cabin

  • Still spawns on lake
  • Ocean and lake merged special under the same id

marina

  • Still spawns on lake
  • Ocean and lake merged special under the same id

Freshwater Research Station

  • Still spawns on lake
  • Ocean and lake merged special under the same id

aircraft_carrier

  • Still spawns on lake
  • New ocean special under the old id, with a new id aircraft_carrier_lake for the old one due to aircraft_carrier being GLOBALLY_UNIQUE so this allows one to spawn in a lake and one in the ocean in the same playthrough
  • 'chievo for reaching it is gained by visiting either

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. json-styled JSON lint passed, label assigned by github actions labels Dec 21, 2023
@worm-girl
Copy link
Contributor

I suggest we do at least make the aircraft carrier ocean-only. Finding one is a gigantic windfall, and since it's a possible starting location it's not too hard to get to if you really want. We could even make it not globally unique.

Other ocean-specific starts would be great for players who want to guarantee they have access to ocean content in their runs. If limiting the carrier to oceans has to wait for that, then so be it.

@Procyonae
Copy link
Contributor Author

Procyonae commented Dec 21, 2023 •
edited
Loading

Erk said just to make copies for now rather than remove lake ones, for the carrier I'm going to have 2 globally unique ones (1 for lake 1 for ocean) I think so one is at least guaranteed to spawn in the ocean. Changing relevant stuff to be ocean only in the long run should be reasonably trivial.

Being able to manipulate your spawn coords for scenarios would obv be great but I don't think that alone should remove elements from elsewhere. (I really want to make a Liberty Isle special which would be a cool start locale)

@BlizzDA
Copy link
Contributor

BlizzDA commented Dec 22, 2023 •
edited
Loading

While you say it isn't removing any specials, I'd suggest removing the lake lighthouse. It makes no sense for it to exist in a lake. And it'd give people a ocean/shore-based spawn if they use the Safe Place start, for example. Or is it better to be a dice roll at present?

@Procyonae
Copy link
Contributor Author

While you say it isn't removing any specials, I'd suggest removing the lake lighthouse. It makes no sense for it to exist in a lake.

I'm not removing things from lakes at present bc the average player isn't going to be going to the ocean atm so it would essentially be removing content for them until we have better long distance travel.

And it'd give people a ocean/shore-based spawn if they use the Safe Place start, for example. Or is it better to be a dice roll at present?

If you set an ocean only thing as a scenario start location it will just fail, scenarios don't search that far, we need infra so you can change the initial search coords for that to work

@Zireael07
Copy link
Contributor

If you set an ocean only thing as a scenario start location it will just fail, scenarios don't search that far, we need infra so you can change the initial search coords for that to work

Definitely a thing that would be welcome in a follow-up PR so that lighthouses can be moved to oceans

@I-am-Erk
Copy link
Member

Yes, if we get it set up so that people can choose to start near the ocean then I'd be ok with moving a few things over there completely. As it stands right now that's close to deleting the content.

@Procyonae Procyonae mentioned this pull request Dec 27, 2023
Closed
@Procyonae
Copy link
Contributor Author

Waiting on me or someone else to implement #70471 or something similar

@Procyonae Procyonae mentioned this pull request Jan 5, 2024
Merged
@github-actions github-actions bot added the Game: Achievements / Conducts / Scores Player goals and how they are tracked. label Jan 6, 2024
@Procyonae Procyonae force-pushed the LakeSpecialsOceanVariants branch from dc5b1a0 to d7eaa89 Compare January 6, 2024 12:03
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Jan 6, 2024
@Procyonae Procyonae force-pushed the LakeSpecialsOceanVariants branch from 6db587a to ea5e40a Compare January 9, 2024 18:29
@github-actions GitHub Actions
Copy link
Contributor

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Feb 18, 2024
@github-actions github-actions bot closed this Mar 19, 2024
@Procyonae
Copy link
Contributor Author

Waiting on going back to this until I finish #72866, this isn't abandoned

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Game: Achievements / Conducts / Scores Player goals and how they are tracked. [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display stale Closed for lack of activity, but still valid.
Projects
Abandoned but Desired PRs
Status: Abandoned PRs with no one to pick them up
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Procyonae @worm-girl @BlizzDA @Zireael07 @I-am-Erk